From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sun, 4 Sep 2011 19:06:14 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~2391^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=95010b1a48d89b2e30d074e16c653f7b12d467c3;p=emacs.git

Merge from trunk.
---

95010b1a48d89b2e30d074e16c653f7b12d467c3